Merge version 3.3.0-1+rpi1 and 3.3.1-1 to produce 3.3.1-1+rpi1

diff --cc debian/changelog
index 9d0312f1f54de365767c6fde40269096cdc9111c,4f55b7bc273073b357e9a22566cb2c76691e51e8..e31a4a0a7b76e2796df91bf203359689bf5e6b2d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,27 -1,9 +1,34 @@@
- qbs (3.3.0-1+rpi1) forky-staging; urgency=medium
++qbs (3.3.1-1+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 1.10.0+dfsg-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 06 Feb 2018 00:27:38 +0000]
 +  * Add symbols file hack for Raspbian.
 +  * Fix clean target.
 +
 +  [changes introduced in 1.12.1+dfsg-2+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
 +  [changes introduced in 1.12.2+dfsg-1+rpi1 by Peter Michael Green]
 +  * Mark another symbol as optional. I'm guessing the presence or absesne of
 +    this one depends on optimisation descisions by the compiler and/or the
 +    version of libstdc++
 +
 +  [changes introduced in 1.13.1-2+rpi1 by Peter Michael Green]
 +  * Extend symbols file hack.
 +
 +  [changes introduced in 1.22.0-4+rpi1 by Peter Michael Green]
 +  * Further extend symbols file hack.
 +
 +  [changes introduced in 2.3.1-4+rpi1 by Peter Michael Green]
 +  * Update symbols file changes for qbs 2.x
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 03 Jul 2026 13:26:54 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 06 Sep 2026 10:15:32 +0000
++
+ qbs (3.3.1-1) unstable; urgency=medium
+ 
+   * Team upload.
+   * New upstream release.
+ 
+  -- Pino Toscano <pino@debian.org>  Thu, 30 Jul 2026 20:01:31 +0200
  
  qbs (3.3.0-1) unstable; urgency=medium